…2000)

* feat(amazonq): added mcp admin level configuration with GetProfile

* feat(amazonq): added UX message for mcp admin control

* test: add unit tests for ProfileStatusMonitor static functionality

* test: add comprehensive unit tests for MCP admin control features

* fix: fix to wait for serviceManager is initialzied to initialize mcp managers

* fix: fix for unit test failures

* fix: fix for UI changes

* fix(amazonq): fix to to rename mcp enabled function and max time limit of 10 seconds

* fix: fix to add async initialization for mcp manager

* fix: fix to move action buttons to mcpEventHandler for listMcpServers

* fix: added try and catch block for mcp initialization

* fix: fix for merge conflicts

* fix: fix for test failure

* fix: remove the unnecessary feature flag

* fix: fix for mynah test failure

* fix: fix to retry function to common util

* fix: fix to add retryUtils

…pyter Notebook (#2114)

* feat(amazonq): read tool ui revamp

* feat(amazonq): read tool message revamp (#2049)

* feat(amazonq): read tool message revamp

* fix tests

* feat: file search ui (#2078)

* feat: file search ui

* fix tests

* fix integration tests

* remove unnecessary type check

* fix: use quotes instead of backticks

* fix header update issue

* fix integration test

…same name (#2118)

* fix(amazonq): handle case where multiple rules are provided with the same name

* fix(amazonq): add unit test for duplicate custom guidelines

* fix(amazonq): add unit test for processToolUses

* fix(amazonq): set context type for AmazonQ.md to rule

* fix(amazonq): add README.md back as rule context type

---------

Co-authored-by: Blake Lazarine <[email protected]>

The token from GitHub Actions is sufficient

* fix: proper pathing for additonal context

* fix: update existing tests to also mock path.join()

* fix(amazonq): update process-permission-updates to be the same as previous behavior

* fix(chat-client): update package.json chat-client to prod

* fix(amazonq): retain mcp permissions after disable/enable server

* fix: dont call initOneServer on Built-in

* fix: deny permission does not persist after restart IDE

---------

Co-authored-by: Boyu <[email protected]>

* feat: remove project type validation from LSP layer

* refactor: remove unused validation functions from LSP layer

* fix: fix to add disk caching for mcp admin state

* fix: fix to add logging

* fix: fix to initialize mcpManager in any case and discover servers based on mcpState

* fix: fix for unit test failure

…n codewhispererServer.ts (#2141)

Co-authored-by: Jiatong Li <[email protected]>

… state (#2143)

Co-authored-by: Laxman Reddy <[email protected]>

* refactor: clean up old NEP code path which is no longer used

* fix: empty userTriggerDecision not being sent for NEP code path

* test: disable telemetry test temporarily

* fix: patch

* revert: a

* revert: a

…tion in JB (#2145)

* fix(amazonq): don't let flare send discard for the still valid suggestion in JB

if a valid sessionId is returned back to JB, JB will eventually
send a decision for it, but when user types a character to reject
the current suggestion, on JB side it will 1) send reject for the current
one 2) send a new trigger for the latest context. 2) will happen before
1) which will discard the current active session on flare's end.
We don't want flare to do that for JB.

* fix(amazonq): createSession doesn't need to close the previous session

it should be handled together with telemetry reporting

* fix(amazonq): fix test

* fix(amazonq): test fix attempt

* fix(amazonq): test fix attempt

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* chore: bump agentic version: 1.29.0

* chore: empty commit to start Github Action (#2150)

---------

Co-authored-by: aws-toolkit-automation <>

* feat: add basic mcp oauth client

* fix: relax condition for triggering oauth flow; add resilience checks for as availability

* feat: add unit test for auth client

* fix: multiple fixes for remote mcp error and timeout

…d Edits (#2147)

Co-authored-by: Boyu <[email protected]>

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Will Lo <[email protected]>

Co-authored-by: aws-toolkit-automation <>

* chore: add the dummpy package back the the script

* chore: fix the zip to cp

* chore: move the file into zip folder

#2475)

* feat: differenciate implicit and explicit reject for inline completion

* fix: add UT for inline reject metric type

Co-authored-by: Boyu <[email protected]>

* fix: McpManager not initialized error

* fix: adding more try catch to avoid crashes due to mcpmanager initialization error

* fix: adding error to debug logs

* Revert "chore: patch 940da04 PR #2478 (#2482)"

This reverts commit bfd2780.

* Revert "chore: update indexing bundle to 4f4fd25d (#2478)"

This reverts commit 940da04.

* chore: update q project context assets 4f4fd25d

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Will Lo <[email protected]>

Co-authored-by: aws-toolkit-automation <>

…ptout (#2484)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Co-authored-by: aws-toolkit-automation <>

* Revert "fix(amazonq): send full finding details to plugin, partial to agent (#2356)"

This reverts commit 961e6ca.

* feat(amazonq): if there are more than 30 findings, do not send to agent, only to code issues panel

* fix(amazonq): do not stop calling listFindings if there are more than 30 findings

* fix(amazonq): do not stop calling listFindings if there are more than 30 findings

---------

Co-authored-by: Blake Lazarine <[email protected]>

Error handling in `setPaidTierMode` is broken as it attempts to JSON stringify a circular type which results in the Flare process crashing. This codepath is not new but is now being hit due to a service side change.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Same root cause as #2500

…ead of empty object (#2492)

* fix(amazonq): prevent base64 encoding error by passing undefined instead of empty object

Fixes #8253, #7896, #8076, #8184

When userInputMessageContext was undefined, it was being replaced with an
empty object {}. The AWS SDK's base64 encoder attempted to encode this
empty object and threw: "toBase64 encoder function only accepts string |
Uint8Array".

Changed messageToStreamingMessage() and chatMessageToMessage() to pass
undefined instead of {} when userInputMessageContext is not provided.

* fix(amazonq): prevent base64 encoding error by passing undefined instead of empty object (#2459)

Fixes #8253, #7896, #8076, #8184

When userInputMessageContext was undefined, it was being replaced with an
empty object {}. The AWS SDK's base64 encoder attempted to encode this
empty object and threw: "toBase64 encoder function only accepts string |
Uint8Array".

Changed messageToStreamingMessage() and chatMessageToMessage() to pass
undefined instead of {} when userInputMessageContext is not provided.

---------

Co-authored-by: aws-toolkit-automation <[email protected]>

* feat: add MCP registry service and validator for governance (#2433)

* feat: add MCP registry service and validator for governance

* fix: fix for unit tests

* fix: fix for using httpUtils with proxy agent

* feat: add MCP registry validation and server config conversion (#2440)

* feat: add MCP registry validation and server config conversion

* fix: fix for mcpManager failures

* feat: implement MCP registry service with validation, error handling, and synchronization (#2443)

* feat(amazonq): add MCP registry sync, enterprise validation. (#2450)

* feat(amazonq): add MCP registry sync, enterprise validation, ACG support, version caching

* fix: fix for test failures

* fix: removed Agentcore check

* feat: add OCI registry support, improve MCP initialization flow (#2465)

* feat: add OCI registry support, improve MCP initialization flow, and enhance registry validation

* fix: fix for failing tests

* fix: fix to make registryActive non-optional

* fix(amazonq): separate server discovery from init (#2480)

* fix(amazonq): separate server discovery from init and improve error handling

* fix: update package-lock.json

* fix: fix for delete, save and cancel buttons for registry mcps

* fix: fix to add addiotnal header and variables to registry mcps

* fix: fix for failing registryUrl tests

* fix: move OCI environment variables to config.env and correct mcpRegistryUrl property name (#2486)

* fix: fix for arguments for local docker mcp servers (#2489)

* fix: fix for env variables for local docker mcp servers

* fix: imporve readability for oci check

* feat: add Docker env var support and enable timeout config for MCP (#2494)

* feat: add Docker env var support and enable timeout config for MCP registry servers

* fix: fix for unit tests

* fix: fix for compilation failure

* fix(amazonq): fix for server refresh

* fix: fix for server refresh

* fix: fix for server init

* fix: fix to add the mcp command in logs (#2499)

* fix: fix to add the mcp command in logs

* fix: fix to add stderr logs

* fix: fix to provide error messages for removed errors from registry (#2511)

* fix: fix upgarde the lsp version to 1.47.0

* fix: fix to provide server error messages for removed errors

* revert: revert package-lock.json changes

* Revert "fix: fix upgarde the lsp version to 1.47.0"

This reverts commit 4086962.

* revert: revert for check interval

* fix: fix for failing unit tests

---------

Co-authored-by: aws-toolkit-automation <[email protected]>
Co-authored-by: Richard Li <[email protected]>

* chore(release): release packages from branch main

* fix: fix for dependency failures

* fix: fix for install failures

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Ashish Reddy Podduturi <[email protected]>

Co-authored-by: aws-toolkit-automation <>

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Co-authored-by: aws-toolkit-automation <>